Removed ifdefs, explicit initialization of some variables