Clean Up Code & Add Classes