Refactor and Review Client Side Codebase