explicit string length removed
extra ifdef removed
code cleanup