Code cleanups
Added ignored