Clean Up Code

- Clean Up Code