Addressed comment by refactoring a little