refactor code to make it more readable