Changed to more readable style