Fix indent
Code clean up and test acceleration based on review feedback