Cleaned up vars and log statements