update of lab optional fields and code clean up.