Code Clean After Mayor changes