Did some cleaning in BasicView