PR #196 code cleanup and solution description rather than reordering