Changes after PHPCs linter
Used old .info to keep history
Changes from os2web repo