updated to psr-2 style conventions