Idiomatic parameter type lettering.
Removed empty package objects.
More restrictive return type.