Refactoring like a boss.

Michael Camilleri inqk.net