clean up, make some props "static final String"