Simplifying data structure, implementing some of the methods.