Code made clearer