Improved Composer JSON
Cleanup code