Minor changes to unite keys, fixed some indentation