Refactor less to limit rule scope