small refactorings, removed warnings..