Finished formatting and commenting