remove comments and make a tiny refactor