Some comments and clean