Lets make code look like less sh****

- Lot of small changes