Renamed some fields and code has been cleared