some cleanup on Eclipse markers and code style - remove strlen