Fixes to package files
Cleaned up inconsistent whitespace