Revert "Improved styles and format"

This reverts commit 4b2779e0bc457fc6bbe3e714d476e8e56a02a923.