Deleted static vars
Added some comments