Credits to Jeremy Castelli
rm useless vars and rewrite comments