Minor - Code spacing
Minor - Fix variables declaration + bad reindentation + phpdoc