Cleaned up and added ignores