Reduced the amount of appending to lists where it wasn't necessary