Code Cleanup V2

Just some more code cleanup