Improve CLI code structure
Add score system for testing