Better use of variable types and names (added features to vector)