Fixed up regex and naming convention
Cleaned up imports