Be less explicit with the class structure

#14