-Space Removal from multiple pages

Finally cleaning up some code. :)