white spaces and underscore fix