Some more code cleanup
cleanup