Refactoring and code style fixes in preparation of adding mesh typed items