#Refactor code