Code cleanup and adding add/remove elb state