SpEL introduced
Minor code review corrections