elegance and the surrelas plus refactoring