Better formatting and commenting