Refactor structure / Add improvment comments