Add TODO and use static final Strings