[Kitaka] Refactored a couple of files.