Merge pull request #1 from sihrc/refactor

Successfully refactored code.
Deleted unnecessary function - get_usernames
resolved merge conflicts