Change ids to use dashes instead of underscores and all improve code readability