code has become less ugly