Clean & Fix Commit