More edits of code