Simplification and Fix