BUG : fixed extra spaces in Module labels

 - cleaned up code a bit for readability