General improvements
Revert "General improvements"

This reverts commit c9af1bd512cb0345991db46ee231017a04033da7.