defined defaults, added space before separator, reorganized variables