some beautifications and testcases.