Extract some methods
Use arrays for all storage

Slightly easier to read.