changed reference names (removed inner class)