Code style updates (PSR 1/2)