Cleaned up comments and logs to console