Intellisense now more consistent. Cleaned up code quite a bit