Some comments and better names