style ajustments and merge fix