switch to more concise module syntax