Changed a few things for more readability