Henrik Reitan #Cleanup
-Small fixes due to code cleanup