A few quick updates to clean up the code.