Cleaned up composer.json (for relative values of 'cleaned up')