Rewrite all methods and group them into a class