solved some whitespace issues