small refactorings to suppress compiler warnings
Basic functionality ready