Cleanup and moving things around. Whoop whoop.