added return to each functions, PHPDoc and correct small typos
shorten class-name