Revert "Little improvements"

This reverts commit 8cc81405c9993e74ad7168a3e6460dda4611261f.