Cleaned up
Cleaned up my mess :-)