Added Cell object and cleaned up a little