Simplify and arrange better