Clean up flash class a little more