Still more code cleanup