#14 - Refactor

Separation between command and container inspection logic.