Minor modifications

Minor modifications, slight compacting of code, and addition of inline
footer lists