Refactoring
Finish find-bugs