Fix indentations and reviewed by Gilbert