Spring cleanup
Merge pull request #315 from twokul/cli-cleanup

Spring cleanup