Revert "Style improvements"

This reverts commit 0283ac91154cd621998a4bab2bf4930684907992.
Style improvements v.2