better naming and place of comments