Refactor out a few more square brackets
Removing empty slots