Clean up Plinth and add validation