Code cleaning

and taking a break