Did some more code cleanup