formatting, cleanup, strict, fix for #3