Code clean, revert builder to non-final variable