Modifications improvements and few style coding modifications (to be PSR-2 compliant)