better naming and whitespace