Code review ;)

Ahh, much nicer!