Refac and comments