Cleaning Code

Solving warnings.