Re-using existing Gemfile.
Refactoring CLI and adding specs.
Clean-up.
Small fixes for layout class.
Clean-up and whitespace.