Initial cleanup attempt

Adding more configurable settings, proper casing, implement "using"