Added little bit of organisation