Rewrite conditions in more natural way