Minor fixes to improve readability

@9rnsr: Some minor improvements. I hope its OK to submit here directly this time.