Small touchup of code