Code cleanup, functions PHPDOC's