Rename things a bit
Use normal tabs