Fixes on code style
Fix on merge conflicts