renamed method
renamed
removed logger