fixing #26: code cleanup

@pranavkm Eilon and I chatted offline and decided to keep the array for now.