Minor formatting and codebase cleaning.