Update cap_msmf.hpp

Various minor cleanup