more metadata consolidation and some refactorings
even morerer metadata consolidation
formatting
Guess what! Sure, metadata consolidation.