Tag removal feature & improve some code practice