Picture refactoring, refacorted constants