Change indent from space to tab and fix some issues