delimate, smart i, aliases cleanup

Signed-off-by: Andrei Thorp <athorp@evernote.com>