Some more formatting and better comments