Simplify, make param initialization more robust