Cleaned up a few strings and comments