Made it a bit more readable again