cleaning up

just some little changes to get better code overview