Code cleanup (using correct log method, removing TODO: auto generated method stub)