Optimizations

Removed 5 Warnings,
Replacing some code with MBP11,1 Code