fixed psr2 violations. (refs #13)