I assumed that, because I was making changes here, that it would be acceptable to clean up the code as well