ok, please remove comment as the cleaner code isn't cleaner than anything else left