Made the changes @ashtonthomas suggested