media class code refactoring and cleanup
removed import module debug info