Cleaned up everything. A lot