some rewriting

extraSpace/Height isn't needed and looped some things
Merge pull request #1 from Neptune-Whitebear/master

some rewriting