Color clean up and made static