Refactor into manga class