Revert "cleaner code"

This reverts commit d511e0647e5720fee8b74836958cc0a2a310ca83.