Cleanups of whitespace and some comments
Clean up MRR handling in Minstrel