reformatted vars names (no more '_' for locals, no more 'm_' for members)