removed user-specifed newline and minor tweaks