Any suggestions to further clean up?