Make edits based on @adg's comments