Move clearfix into  conditional

This way we don't output clearfix code when there's no need.