Cleanup

Anton Hvornumrequested to merge
cleanup into master

Created by: Torxed

Moved everything into functions. Same functionality tho.

Merge request reports