Fixed up the imports to follow a consistent style and adjusted variable names accordingly.
Fixed up the imports to follow a consistent style and adjusted variable names accordingly.

Markbnj/jobber,Markbnj/jobber