removing module header, improving comments