Clean up internal code a bit