Minor style updates + replaced and/or with &&/||