formatting, delete old code