Code Cleanup

Code Cleanup and reuse for buy wallet area