[Core] Tab cleanup
[Core] More tab cleanup