Cleaned up the comments and awful logging