Removed trailing underscores