cleaned up materials code and imports