clean code, use constants for bundle keys
converted line delimiters to unix