a = b ? c : d refactoring + other stuff