code style + formatting fixes