Code cleanup
Update Oasis