Refactoring

Removed old regex code.
Shortened type names