improved readability and layout