Simplify and clean style, rebuild