Remove some unneeded semicolons
Use explicit if for condition

Clearer than &&
Remove some unnecessary quotes
Add comment
Use space before semicolon as command separator