Miscellaneous improvements.
Using Neptune class as a lightweight DI container.