modified commit file
refactored functions in controller and services