Made some minor code changes

Made some changes to bring the code more inline with PSR standards