Cleaned up and added BOM.