Fixing construction method.
Standardizing, formatting, removing touch references. Touch should have
it's own module.