Make PSR-2 compatible, remove unnecessry Engine class