Interface renaming and cleanup
Fixing time formatting