Trying to improve readability with some rules