removing warnings
refactor to rename fragment classes