comments+refact