Moving keywords to static constants