Better parameter naming and clearer comments