[ab4s:import] tidy up code a bit