Fixed general formatting