Cleaned up
Cleaned up ALOT