Time: Clean up vars and spacing