Cleaned up imports and renamed static class vars to
be more meaningful
Merge remote-tracking branch 'origin/master'