Cleaned up ALL THE THINGS