Removed unecessary tags and comments stuff