More logs removed and organized code