Move some methods to Cell class

Just some refactoring