Cleanup; fix issue with using comp with 1 arg