Code cleanup to follow psr2 standard