Rework after comments