Cleaned up module a bit, now we have some more room