Added comments, streamlined code
Better variable names, removed unneeded classes.