Cleaning a little bit + logs