[TASK] Clean up some conditions for legibility