Cleanup of line spacing
Refactor Blueprint, add unit test for it