Change Time internal types to match number cfg menues
Refactor to use helper methods
Remove unused variables