Minor codebase cleanup