Fixed EndAlignment offences
Fixed AndOr offences
Removed useless variable assignments