updated style, more readable