Small fixes in naming and comments