Add bold lines option
tidy up