Made some code changes to make things more easily explainable in the Wiki