some more code cleanup
changes