Remove Whitespace Lines
Update ModelWrapper