make inner classes static where possible