- Fix indentation and minor checks added.