clean code in wmc builder