Removing some boilerplate & personalizing markup