Updated after feedback

Made changes from the feedback that i got.