Cleaning up readability