Add comments and delete separate file