cleaned up comments and logs