Removed unnecessary code, updated conversion code
Processed comments by teungis
Added new custom exception 'NotFoundException'