mounts: clean code