Added some code edits