-Added check for creation of main tags
-Style changes