Cleaning up page for further dev