Sandra Nunnerley Inc

Re-arrange objects & Clean up casts