Remove comments for MRC
Make an unused public property private
Beautify code