Removed unnecessary base check.
Fixed some syntax issues.