Cleanup class
Order of methods is pretty fucked up. Bring it in order!