code tidy ups for push