beginning internal improvements
minor
class structure