Small fix, more cleaning