Cleaned up module code (mostly adding section headers)