apply some more code conventions
uniform naming of factory methods