Cleaned Up Code

Cleaned up code a little bit after time formatting update.