Cleanup
Draft: cast primitive types
Casting of ints