Removed 'extern' which is not used (yet?) and code normalization