x all the y - refactor code

refactor code - x all the y

Comments