Minor, format code + fixing PHP warnings.
Minor - format code, removing var_dumps