clauswilke Clean up and simplify