Increased readability a bit