cleaning up

just some adjustment for better overview