Fixed bugs & Refactoring