Cleanup

just some code cleaning