NOOP: Refactor to use traits
NOOP: Remove unused import statements