reorganising + formatting