Fix names, comments, shorter code