Refactoring & Created Basic Client