Bugfix for issue #47. Code clean-up to reduce autoloading