Code cleanup, including Composer dependancies.