Cleaned up comments in prep for new feature