Clean up platform implementation a bit