Clean up wam masonry and make it pass JSLint