Cleaning up a few details