Cleaned up module file