Formatting and reduce redundancies