Code cleanup, added reloadData