Cleanup

Did some code cleanup