Updated formatting (turning everything to 2space tabs)