Test commit and minor cleanup