Indeed better, I just tried to keep it minimalistic, as the original solution was based on a fixed column position.