Changed a few things here and there for easier reading