bit more code cleanup