Cleaned up JS and comments