gets 100% and nor findbug errors and no more inner classes