Revise codes - add null checking codes, change variable names, remove unused codes...