Readability; removed old code