Can you do something about the excess whitespace lines? :-)