Fixing PHP notice
Minor cosmetic changes