add tag + code cleanup