Clean code in functions.php and template-tags.php
See issue #63