Small cleanup of the codebase.