better naming and clearer comments