remove pointless newlines
add second constructor