Small Commit cleanup