Project updates

Minor code cleanup