Surfaced more tools (whitespace, format)

Further refactored code