Code cleanup
PHP 5.3 compability
Update composer.json