Minor refactoring. (Initializing at header, code convention etc..)