removed strings and added defines