Minor design changes, for better readability