Cleaned up state_builder()

Added an array to populate the state names and values