Litt opprydding, bugfix