Shorten variable names and extract tag constants

Signed-off-by: Igor Popov <igor.popov89@gmail.com>