Refactory and BugFixing