Fixed bugs & Refactor