Changed layout for readability