Beautified and fixed dependency issue.