Cleaning code, removing prints and stuff