Cleaned up comments and log output