clean up indentations and code post-merge