Incorporate modifications suggested by Lee-Ping. Remove redundancies.