Refactoring for readbility