Renamed a few variables and removed needless brackets.