Changed the indentation and naming to follow rest of the extension