Added concern and refactor code