Clean Up and Update some Classes!