Moved over dependencies and fixed up indentation