Refactor some strings to make them more sane and remove unnecessary
comments and add new ones