some rewriting

extraSpace/Height isn't needed and looped some things