Functional fixes/cleanup

New line.