Removed unneded check
Compact lines