Removed double declarations from #84

Removed double declarations from #84

Should be easier to maintain now, sorry about that.