Added composer and did some cleanup