Cleaned up the interface for rough hard spheres and merged it with the standard hard sphere interaction