more breaking down and cleanup