Added some structuring!