more sensible naming and ate whitespace