More seperation of concerns. Not echoing html anymore