clean-up
Initial work on data storage service, change password activity, consolidate redundant code