Clean up syntax by using on