Minor fixes + more simple statement formatters