Fix indentation and try to reduce dependencies on snap