fixed general formatting