Better commenting, indentation