Refactored: changed field names; removed dead code