Lazy param eval
small clean up