cleanup, fix style warnings