General cleanup
Cleaned up all the things