formatting test/getting rid of client method/renaming variables
merge conflicts