Remade classes to look neater