Add missing meta files
Clean up to make coding style more consistent