tidying and removing console logs