Under a single structure/Cleaned up a bit of code