Remove use of @SafeVarargs (breaking Java6 build)
Organize and Import