more fomatting changes, see #6