Cleaned up crap