Small amount of cleanup and commentary on next step