Cell: minor code refactoring, movement
1 file changed