Cleaning up

- Proper Indenting
- Removing white spaces
- Making functions more clearer to see by leaving a line after the
brackets.