Cleaned up modulesupport according to codestyle