DRY removed, spacing issues resolved
Time class added for addition of time