Clean code / functions

Cleaned up code a bit and added some functions so it's easier to change
the storke type