Formatting tweak
Initial module work