Minor changes based on initial feedback