Solving issues identified on revision