Minor cleanup for footer and small refactoring