Clean code, prepare for using linked-list