Small improvements (syntax)