Minor fixes, some indentation changes