Final code edits