Cleaned up a bit?

Don't really know why, but it seems meer straightforward this way.
Might have been in the tutorial for educational purposes mostly.
Added new tools