Refactoring
Fix bugs.