Improve for modeline