Some commenting, formatting and file-parsing work