fixed psr2 violations. resolves #24