Revert "Aesthetic changes"

This reverts commit 987bd3cc7f8f9b6caf4671cc048c708b52abdcb3.