Minor code cleanup before branching to complete the MVP requirements