darn refactor