Edited comments in cleanup.php
Committing theme changes
fixed conflict issues in functions.php