Annndd another clean up