Cleaned up all of the shit