Introducing preprocessors
Minor label changes
Removing useless init code