If you use the val as I mentionned above, you should be able to remove the trailing underscore. This cleans the code a bit.