Line length was bothering me. Also updated the options