Added tags

some cleaning