moderize build a bit