Edits for organization / style consistency