Updates and reformatting