Cleaned up my mess