Remove an unnecessary 'else' (save some gates)
Comment cleanup