Added a tiny bit of structure