Added missing underscore on address variables, realigned statements.