Add keyword order changes, fix spaces in methods.