A little bit of code cleanup.
Configuring for Docker compatibility.