Code cleanup using the new #= operator