Adds  and  back.
Fix up codestyles as per PSR2 standard.