Minor tweaks to clean up the codebase