Better names and api doco