Simplify into single .h/.m pair