Well done with some cleanup in this file!