Adjustments to visual studio theme and a little code cleanup