improved some indentation