Cleans up more square bracket notation