Small changes

- Removing repeated blank lines.
- Order is important to me.
- Unnecesary nesting.
- ;)