Playing with modules

Code cleanup