More refactor to be more one liner