Removed unused methods and made field names consistent