Fixed some indentation issues. Merged with objectify branch.