A bit of renaming and reformatting