implemented defining procedures
removed .swp files