Huge refactoring of USEs and comments