Refactor - shorten code