Fixed explicit key in embeeded, reorganized code