Implemented Code Refactor(Partial)