Removing pointless underscore