fix of whitespace issues and cleanup of packages module.