A few little cleanups in the code

1) cleaned up the enums to just use a property, rather than overriding getters
2) random import cleanups & interface cleanup.