Added using section and other minor clean up.