made formatting and consistency changes