Clean up - Part 2

If I ever accidentally break anything from cleaning up I am sorry in advance :).