Very minor improvements in code