refine and format
Format Solution macro for VS2010