More analysis and cleaning