Fix some constants issues
Update README
Remove internal sun's code