No more breakable + other code review changes