Maintenance by refactoring (no new feature introduce).

I just came by to clean up code, so I can dev easier in the future.