Made more changes based on suggestions