Revert "Applied small improvements"

This reverts commit e5b454ecd12869620f30c206175b999c244d41a8.