Changes according to @madx review