Revert "final improvements"

This reverts commit e0e342671049570a9fcd7dd670c59e67b2dc4f4d.