review comments

This is all i could do on my lunch break :( i am very excited about the changes you guys made
inverted to avoid nesting