Cleanup and rewording things