formatting, fix warnings