Organize and make small edits to contract