Cleaned up and re-factored .val()