Edits to make code cleaner