Whitespace
Simplify package definition
Use standard package naming pattern
Simplify package definition