Formatting fix, include main module, short pass at indexer method for testing
Explicit require statements, removed unneeded calls to module_function