use default params and remove some code
minor tweak to method names