Some cleanups
Added shiv