Better names and comments