Revert "Fixed messy coding."

This reverts commit 6c965f43d546bd2a6d28b4d9fed5db74566646c3.
Revert "Revert "Fixed messy coding.""

This reverts commit b4e25f1122b456a7c2dba44f4678b7f8f2b5ff0e.