Minor code changes
Fix indentations