Update Type Checker and Indentation

Update Indentation and Type checker