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

This reverts commit f14e7bac.

Reverted due to missinterpretation of agreement, obvious dislike and me not interested in doing fights for feature I don't actually need