Changed to real tabs and removed/changed some if-statments.