FAQ page and some code cleaning