Little simplifications for code readability