More PSR-2 related changes, few typos

Signed-off-by: Sebastian Klaus <sebastian@klaus.com.au>