comments and clearer methods naming