Comment, Code refactoring, fix bugs