Remove uneeded function, fix formatting