Make private methods static when possible. Same for private inner classes