Some changes based on the notes Moli left
Merge pull request #1812 from Wikia/MoliReview

Some changes based on the notes Moli left