Made more VIM friendly