#19 Small cleanup