Formatting: Removed some old junk code
Fixed: Modules named correctly