Refactoring and reformatting to be more descriptive and consistent.