some indentation fixed