whitespace tweaks
internal naming
removed deprecated getHandler