Minor changes and static Strings definition