Log/Comment Clean up and a little efficiency