Cleaning up code n stuff