[#6] Import organising, added self in several places.