Code cleanup

Minor code cleanup for presentation purposes