Refactored classes' name. Added some comments to the code