Adding public static strings
Slight code cleanup