Improve structure in order to make it more understandable