indentation issues and other feedbacks from master