move towards module syntax