Suggestions from Michael

Added all suggestions from Michael except for persisting data.