Removed some unused functions.
Some small changes
Add a strong tag