made entities a bit cleaner, by adding a Init function to have a place where sub entities could be created + formatting changes