don't use impl classes suffix at all
code cleanup