more more code cleanup