Code cleanup and fixes

 - Fixed the indentation/spaces issue
 - Fixing the issue that was caused by the core ServiceProvider no longer providing a `package` function