Clean up module syntax

Fix #134