cleaned up and stablized.

Signed-off-by: Harry Truong <harry.truong@redcross.org>