Update 2.6

Mostly clean and clear, change coding standard to PSR-2