Removed unnecessary error logging and error catching, update private to protected methods