Some PSR-2 fixes - Removing unnecessary vars