Cleaned up comments and logs