Adding dependencies and cleaning up spaces.