Fix code formatting, make making of deps explicit