Marked certain variables as static as appropiate