fix formatting and use Vector instead of List to maintain order