Refactored project into multiple files and also displays tally counts