un-expose some types; comment/naming style to comply with golint