Better formatting and a cleaner look