Summary: refactored code to allow platform-specific differences
Reviewed-by: dlong, twisti
Contributed-by: NGoetz Lindenmaier <goetz.lindenmaier@sap.com>