formatting + pic fixes; fix broken code styles