Trying to fix readability/maintainability a bit