Clean up a bit
Add constants handling
Make constants native