Cleanup
Clean up and changes and stuff