Cosmetic changes + styling.

Fixed merging garbage
Fixed