final touches on formatting and commenting