removd warnings
refactoring