Generic fixes : Code cleanup