Minor formatting and renaming