Fixed bad variable
Fixed boilerplate