Removed unnecessary couts and moved stuff around