Low handing optimizations

Hi, I've made couple of simple optimizations which increase module loading speed. I've run tests and everything is passing just fine. Please review and let me know what you think. Thanks.