Improved cohesion, awaiting modified CommandLineUI & ResponseParser