Add runtime module loading
Removed trailing whitespaces