comments and better names