remove some whitespace, add group comments for getters/setters/detters