Some updates to comply with PSR-1