comments and cleaning code