RM-Gira, Stefan's Versuchs Version
Code Cleanup