Code cleaned up.  Still need to extract method calls