Code Reformatting to expand Mouse Manager