Adjusted simplify and slight buffer for aesthetics