refactoring
silence find bugs warnings