more formatting and comments