Cleaned up modules using scope