Cleanup quotes, comments, overkill variables