Fixed psr2 conventions