Add header and footer + some code golfing