(#18) Some code cleanup

1 job for 18-testing in 3 minutes and 12 seconds