batoto and mangacow improved & refactoring