refactored: whitespace uglyness