MOGAMI: CleanUp and Optimizations