Lots of new lines in here - are they all necessary?