Make border smaller
Spaces to tabs
Clean up