Project wide code cleanup