Some reindentation cleanup