clean up: amalgamate methods