[Q] Suggestions for improvements please