Multimedia: Variable naming and space cleaning