Simplification and corrections