cleanup and added vim setting for binary