Small modifications based off Jesse's feedback