More refactoring, started on multi-line stuff