2nd Commit

Improvements on functions.php