Cleaned up the shit