Greeting consolidation

Changed time variable assignment to cut down on code