Removed non-required commenting and logging