Modified comments
Removed comments
Moved the completion of units to its own function to keep timeTick clean and easy to read
Cleaned up timeTick and added test code