cleanup and tiny comment