Some code cleanup
Added: Time Tracking module by @angek