Simplifications and comments