A little bit refactoring
#3: Implementation of arrays