Code Cleanup

- Some more code cleanup