More edits for easier viewing