Removes unnecessary if condition
Fixes formatting
Squashes bug