Further cleanup of code, some identations were still wrong due to tabs being inside...