Added logs + Cosmetics
Added logs + Cosmetics