Just fixed up general styling fun.
Fixed Merge conflicts.